From f92899900f763390971025945a90a02ca9fd5259 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Tue, 25 Jan 2005 17:57:23 +0000 Subject: [PATCH] bitkeeper revision 1.1159.223.41 (41f68883FaU7hVfFtWiOkCPnI6N1Hw) Fix root Makefile so that targets only install to / if you do a 'make install'. All other targets will install to local dist directory, as before. --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0bd91f33ab..d1d7ba5df4 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,10 @@ # Grand Unified Makefile for Xen. # +# Default is to install to local 'dist' directory. +DISTDIR ?= $(CURDIR)/dist +DESTDIR ?= $(DISTDIR)/install + INSTALL := install INSTALL_DIR := $(INSTALL) -d -m0755 INSTALL_DATA := $(INSTALL) -m0644 @@ -27,6 +31,7 @@ all: dist # install everything into the standard system directories # NB: install explicitly does not check that everything is up to date! +install: DESTDIR= install: xen checked-tools kernels docs # Only check for install req'mts on 'make install', not on 'make dist'. @@ -35,8 +40,6 @@ checked-tools: $(MAKE) -C tools install # build and install everything into local dist directory -dist: DISTDIR=$(CURDIR)/dist -dist: DESTDIR=$(DISTDIR)/install dist: xen tools kernels docs $(INSTALL_DIR) $(DISTDIR)/check $(INSTALL_DATA) ./COPYING $(DISTDIR) -- 2.30.2